Merge changes from topic 'jack-d-b3-as-stable' am: 8d35b827f4 am: 16fc2d0fe1 am: c078c79a8f
am: 9e646be076

Change-Id: Ia7b0a7efc3213ab23775d9a2e02a87e643fcccda