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

Change-Id: I453c5ae9451fce2fbfee26b8667e486837b626f7