Bug: 21669400 Change-Id: I54691661605a2e2c1871781964aed343840b8560 (cherry-pick from commit 33c2d441)