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

Change-Id: Ibb8f24a67a2eb53c98cac6d63c25ebb91ddda48f