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

Change-Id: Ibdac259e4ac80dae11c4dce1e1bb23c90ee118e8