Merge changes from topic "am-a1e8782806b548b280daa90a2ff2320c" am: e2201303a6
am: 35dfddc30b

Change-Id: I2dc64df145736fa89743ac1b4712790012f3acc9