bug 1332670 fix

Change-Id: I50e6e2cc76d75482e25e5f66429a2ef6a66c074d
Merge "bug 1332670 fix"