Merge 0a04a432f70b65d2fb4a68f426a1279ef842d7d6 on remote branch

Change-Id: I4124008ac6769cb67621675626bd4ff146b0f8ba