Bug: 26879394 Change-Id: I09ac9027ca343e00488dedab8df1687fd32bb255 (cherry picked from commit 6b843bcf)