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

Change-Id: I4175c30dff7d7543d39fa177bc3bfa8895c622a5