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

Change-Id: I2fc037f28e620278a646ba2cf43256bf313f9dd9