Bug: 18097559 (cherry picked from commit f485547b) Change-Id: I242105faa8210abc9635a951b25b127cd64ed23c