Merge changes from topic "ka05"
am: b3656c7b1b

Change-Id: I2448348d1501ca50daac87f4c06c120b4de3b2ae