Bug: 27865109 (cherry picked from commit 2a894f43) Change-Id: Icb42a08120aa80b787efe207aa51fd08305cec08