Merge changes from topic 'cherry_pms_installd'
am: 421c74f8e7

Change-Id: Ie69459a637f38cb1d9cf51f9069851fb75232264