Bug: 22023363 (cherry picked from commit baa72515) Change-Id: If81d9a67ba9edf15688f4369390a6734d92a8f3c