Merge changes from topic "b116618418"
am: 002fa789e6

Change-Id: I60b0e19bad15682fbfbc7f67c402baee7fb91f19