Bug: 27449879 (cherry picked from commit f193878a) Change-Id: Ieb4f258feaaef70a4982495e4f63ed778280b8da