Merge changes from topic "cuttlefish-bringup" am: 43ff180b58 am: b648a4c2b5
am: a64c8aca3c  -s ours

Change-Id: Iac499486c3cf2929eec43fd3d48b07be39fc0343