Merge 18c40c9f89f79b59f9df8130d322cdd7aafb237e on remote branch

Change-Id: I4dc242ebc5559257521776eaca4f8046b7c327e8