Merge changes from topic "neven"
am: b06c7cc52e

Change-Id: Id1cf5bc4a52eaedf16678ff15bb1620976537af8