Merge changes from topic "record" am: e843b7c118 am: 360776a89e

Change-Id: Idfc4ab4cc53b2f63fb353c3d68952262d3719b72