Merge commit 'c84ab63693cb86c7623e1d5b4f2a66fa2786085e' into HEAD
Change-Id: I83801403874a6c36b356340090bb7a2ee4d57a67