Fix installation on some JB am: 38be0f4882
am: 84362fa835

Change-Id: Ief08de3010d7620b79010297c93bab5325f9e7cd