Merge changes from topic 'cherry_pms_installd' am: 59ac10df3a am: 9756df8e85 am: f8adc1c101
am: a3f9d1bde9

Change-Id: I3c94900e32872b76ab87492d4105dc2a5cbcca07