Merge changes from topic "record"
am: e843b7c118

Change-Id: I13609697a9d8434101085f4f9da82e11afa75e0e