Merge 46fa9c1116d808cc012275d8f8bf5d5b0dfb9c56 on remote branch

Change-Id: Iad29033399ab6b240d5698ca80ff78b6d2349f72