Merge changes from topic "b69050941" am: 37eb97d911
am: 864a1baa0f

Change-Id: I676cce806836ef6a9204e7b482e94b8cb1d7163f