Merge b1a66cfb268d4358ffe6e1f200d582e2ecbfda79 on remote branch

Change-Id: Ib7b3c3bb992997725df0bbf7f26d31b84a52c7bc