Fixes: 149373695
Test: build, manual
Change-Id: I7501ef393e226bb38c72a1ee465bf9c72586716b
Merged-In: I7501ef393e226bb38c72a1ee465bf9c72586716b
(cherry picked from commit c0543e833f)
Fixes: 149373695
Test: build, manual
Change-Id: I7501ef393e226bb38c72a1ee465bf9c72586716b
Merged-In: I7501ef393e226bb38c72a1ee465bf9c72586716b
(cherry picked from commit c0543e833f)