Merge e35305fddb6861074d0a4d0169dca67d773d79a1 on remote branch

Change-Id: I83b46e58231083902a86624fb9f2bf5c665770b5