Merge commit '5c3b2b4267ad0ba4f7e7e8e38b91a8aeb1eb30a0' into dec6
am: 8e15412dcd

Change-Id: I9934417d5541d7c1e10374ac99dbb41a2cd268c7