Bug: 18338026 Change-Id: I6c37774ef1312278ae81280561060662fef923fb (cherry picked from commit b35c9602)