Bug: 21693466 Change-Id: I398b6330cb739c6cadae1c3abd52a4d75edb1d3b (cherry picked from commit 0576649c)