Merge changes Id98050c5,Ib60bb047
am: 08d36d87bc

Change-Id: I7b75347f21cb8e5ae6caaf4aae144c0e1800c05b