Merge ee4618bc

Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940