* Partially reverts commit a83c711c8f. Change-Id: If296f8952e124088e090244b0ec90992a490a580
a83c711c8f