Merge "Removing an extra installd call." am: 9db70d29a1 am: d8a48663c6 am: d2faa6a80d
am: c5be161796

Change-Id: I669b63a984da246cf8e797a31c1ae77658b5a62b