(cherry picked from commit 9d2d6b6b) Bug: 19798387 Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413