Bug: 26864151, Bug: 26863281 Change-Id: I33e357aac74bceda50c794eb6057c363de9250b8 (cherry picked from commit 89a9937927e05a86938aa297a79047ce1a7c7d2d)
Bug: 26864151, Bug: 26863281 Change-Id: I33e357aac74bceda50c794eb6057c363de9250b8 (cherry picked from commit 89a9937927e05a86938aa297a79047ce1a7c7d2d)