Merge tag jb8u152-b1248.22
am: 9712967b75

Change-Id: I677ff01e8adc4b8107e9f5ae29afa2c531b738e7