Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
am: 85f3996d72

Change-Id: Ia780475dbbd9ebd58f5bcc9cefa74108f48ca53b