[automerger skipped] Merge changes from topic "R" am: 39a77f1951
am: 4f305a9921 -s ours
am skip reason: change_id I179f7b92dcf65e77f039e6cd42d91bf5b1461e35 with SHA1 48002f6313 is in history

Change-Id: I559a9d6ef78b2de87cecf9ec5e5e692f60548b11