Merge 863a18bce6315a37eb539520753003afb8e22963 on remote branch

Change-Id: Ia2a226b128f24542e4930aa76f7a1170dd263ac5