Merge "Revert "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950"" am: cceee343ee
am: d4f509040d

Change-Id: I84117ba3defbf997285614462b122d976b324a43