Merge b49f981bd29d7cba0f19361d92a54b22e6c649e9 on remote branch

Change-Id: I371c6b229ba9286183b37c2496407e03457a984b