Merge b9ce7f744ca452eb473b08c3102b44e1bfc093f4 on remote branch

Change-Id: Ieb8f11bd955a9d18a3064c0195d8ddd4d2000497