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

Change-Id: I1af3486e977868f838b40152d554fd3fcafd0e38