Merge fae39774d5c50745a1cf9ac124166079803484f2 on remote branch

Change-Id: I35948f052d5d5c74369009c13f08612c238937ba