Revert "TEST 2 (cherry picked from commit eedd87e5dfcad91bc5ec6f74830cc178e4a4751e)"

This reverts commit 4bc6c247e1b3096d7cb8746868c75c9855df57ef.

Change-Id: Idafa41ff69173bdb1477d498bdceaa966d8aa1c8
Merge "Revert "TEST 2 (cherry picked from commit eedd87e5dfcad91bc5ec6f74830cc178e4a4751e)""