Bug: 23270724 Change-Id: Ib100fbac71d511bb2ed4d56c265e7cbe5fecbd65 (cherry picked from commit 70697bc4)