Merge commit '48f6b61' (version v0.8) into import am: 776ab4ae5f am: 4f3d6a0859 am: d2166114ac

Change-Id: I40ffa13c576c7a7afdf200b6c9ab9ffbff9e7be8