Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881
am: fe5a42c88d

Change-Id: Ieb81d90a69d894b6ec4ce4bac5216a8ebce2f446