Merge changes from topics "141018421_set3", "146905502" am: 79cb7e4361 am: 83a53679ca

Change-Id: I7b9d97a214487d75a786bcd145a6df10b966e2ba