bug 1368271 fix

Change-Id: I7a609467e3192854bd2a31b91c1c4ce150a9bf28
Merge "bug 1368271 fix"