Merge "Improve current program info validation." into pi-dev
am: a3a045f8d6

Change-Id: Ic070aecf546ce90cd88fff3f93dd81fb9173ef46