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

Change-Id: I1454971f35f5ddcfea996ec917056dfef4390f94