Merge 11971fbdc4cc0fa3594004951010c445af9438fe on remote branch

Change-Id: If86b7099451fa2ce27330eb4e8e519c83a5ba9d5