Merge dd44ffca9ad0a7df4bd419aab828b6925fcb81da on remote branch

Change-Id: I6a745a4b3e961c46e9bb6726b50b79d56e0ca0e5