Merge changes from topic "141388730"
am: 50c4313058

Change-Id: I0765cc4847d91a6902668756a31c7011bc5b4a54