Merge 89760fc8717569a3e5852e8bb55a7988be497c07 on remote branch

Change-Id: I38081b58421af2d42764ef6a91d8724d902d6a44