Merge effb81b9d4564151c1b2e9e3ac8558f40cb26561 on remote branch

Change-Id: If17d646b1fa60366d2ee03da1d29c9a4f10b6bca