Merge 6facc43568f6de2ca4142bb497077639c83db7cd on remote branch

Change-Id: Ia75a7d01ff96e141b4ea965f0fc43d987a9fdfc3