Merge "Revert "Manually merge commit 'd3d4725f08ac2f27368cda123e87751231c9bd14' into nyc-dev"" into nyc-dev am: fe55a71945 am: 9cfbef0d0e
am: 0a68d1c143

Change-Id: Iff380a66ee4c19d269add0c68d54e5c66b533535