Merge ab79e4c2233351aeae2940ad779e41211a7e8e38 on remote branch

Change-Id: I48033e18b291904481d7da300e2b5a9afadf6169