Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7
am: 0bb64f1b3e

Change-Id: I93d809446e316aa9c8c126e10229b09005f24ac3