Merge 306b238497a456135c8f9f0f490a806d6b91987a on remote branch

Change-Id: Ib9118e14ae717c684a72c906cb5a37398c398ca2