Merge ee53d8bdf2b1d6df8c43ea86c73141432787fc65 on remote branch

Change-Id: I3bddb8d6be737345534e2994c74bdf52d210d792