Merge 7edbfa5bbcfe6f34c7bfe14b72617ce5e7a42895 on remote branch

Change-Id: I82410fd80a5689d26cb44af0d89a860a5b9bdcb8