Merge changes from topic "146593004" am: 3863c17fd2 am: acf7918f60

Change-Id: I49421bb2304df82c44e6c8204b9f89fb843590b9