Bug:21199392 Change-Id: Iae4b82254ddf6b60d442258e79ff0ea4d54c0a4d (cherry picked from commit 58ae1641)