Merge bfc1a2cf2f8d0ecaf3de39d325e0b0814e08ca6f on remote branch

Change-Id: I520f8c6cd9677546296e1b29307f6a38657acb9c