Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev am: 7366e8c16a
am: 5a7be749f7

Change-Id: Idb189d89f9cebcc6e9809e7f489c51baae5e8253