Merge "Fix installd test" into oc-dev
am: 22651020b5

Change-Id: I6ce8ae2c3550786fe876ce59beb5f29214b05bba