Merge changes from topic "141388730" am: 50c4313058
am: cc2d8d495d

Change-Id: I921654c18376d2854e001ec6118355075d46e5a6