Test: manual Bug:36973866 Change-Id: Ia7168f313abebbf3c5c4fc26567ed914f1987a91 (cherry picked from commit c5706f65)