Bug: 28676926 Change-Id: If5e7f1c886334ce0ea2e3e2b64616eddf69c9377 (cherry picked from commit 36a95bcf)