Bug:27245894 (cherry picked from commit 573895bb) Change-Id: I1b879f23cd2bb49070cbfee40ae1b8a586a328dc