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

Change-Id: I7741628030ee91621d5c4165db95dcc2787fba20