Merge changes from topic 'cherry_pms_installd'
am: 59ac10df3a

Change-Id: Ifb18d02cfd54ef3c15696832e88e7731f8dc162b