Bug: 16024763 (cherry picked from commit c5d824a2) Change-Id: Ideab9adedabf3c58f5162e43e79c72af0642bdfa