Merge changes from topic 'jack-d-b3-as-stable'
am: 52eafee87a

Change-Id: I7e4fb947fe8f2c5ea8d1091583c468f8c9ca3d35