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

Change-Id: I81533e7e035c3e94ad0388b142da7610454d4b71