Merge changes from topic 'frankenbuild' into oc-dev
am: adb87ec50b

Change-Id: I5ede652c22717b2a986b6fd7608a97e6a3531fa0