Bug: b.android.com/72698 Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca (cherry picked from commit f2fa79e9)