Revert "Squashed commit of the following AOSP/master changes"

You're joking, right PD?

This reverts commit b243449d8996b4dabab2dadd3ea08d58e0e77518.

Change-Id: Ic7dc0713648bb293f43efcdc031bbf7a5d48cd65