Merge changes from topic "neven" am: b06c7cc52e
am: caf2eef611

Change-Id: Ic4b486daf9155d17bbcf6bb08b96635d63dcce8c