Bug fixing for AOSP refresh.

Change-Id: Ie4b89db6663832e3b992e492fb5dcee0d0bc539d
1 file changed