Merge commit 'da8ac83d6671553e19faf7d6839c8fe3274ad2a5' into HEAD
Change-Id: I1543623cc6c67359fdb0b78357e2550c849b1e1d