Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c  -s ours am: 4758facf28
am: db1e02306c

Change-Id: I81c93c34c33f32ff0ebd471a9e91b8e8a230abaa