Merge commit 'ec55aa7beb7b690b578d0659c8f699ef5faf4d08' into patch_branch Change-Id: Ice79cd7f8e352bc12a552c5c98f582b25aee5b5e