Merge commit 'e35b54d87231c56626f73f9d5d2146af6df35c8c' into HEAD
Change-Id: Ib4d3842850be3f4f4c8d229be8982e39fd5f0a93