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