Merge changes from topic "cuttlefish-bringup"
am: 43ff180b58

Change-Id: I42c03c61820576d282f2f67a4f207bed928175b0