Merge aadf02a44af96aa35e45ce5a97b6e503e03d49f9 on remote branch

Change-Id: Id0971a9f8561041c38d4dff0c0c5f36c09d382c6