Merge changes from topic "R"
am: 39a77f1951

Change-Id: I32a27fb346e236a6836d4c139cac2fb4cfdb733d