Merge changes I955f9dfa,Ibfbb9d67 into nyc-mr1-dev
am: dc77fbca27

Change-Id: Ib63cba53ddc60a594b4ca58a3d59e2950092f101