Merge a52fe1a9d29e304498483e19c3adad759a4fcb17 on remote branch

Change-Id: Ib467197c1dbba2cbf828fd6f6898117ff26f4666