b/26279420 (cherry picked from commit 5fc7099e1e) Change-Id: Ie24e6fbb1f82e84bf382b440f4eb533ad1a473a5
5fc7099e1e