Merge 3edabf5894a3bdb93b4ec83cb301915c27fdcab2 on remote branch

Change-Id: Ieba6237a5855cb1e133825f6e5d4fae3532611dd