Merge commit '3f4e5c4563068f277141f5fb3d96ec02afc7ac95' into master am: 1ca7763b9d

Change-Id: I1fe5a304332efb470b3d9e9eef73dea8842e67d4