Merge changes from topic 'bug_30451114' into nyc-mr1-dev
am: aed7048ce0

Change-Id: I31bda3b9df0ad7c56c3a932287eeaf301af3ba13