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

Change-Id: Ia5be9c454a467036bac73857078a5b5cf8ffef0a