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

Change-Id: I38415b3b9c5d18c6801f7ef6abc53f0ee8e6c7e5