Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev
am: bd629f69ed

Change-Id: I23b5db36cb5d4d72a23894e75e36ad483ad23338