Merge commit '48f6b61' (version v0.8) into import

Change-Id: Icb233d0c82a2fb3c2ee0cb8e0a3cf93360f22613