Synced the code from master branch

Fixes: 144364245
Test: compilation
Change-Id: I1c6981128f3f2fe5ae36e83a289c226ac59be742
Merged-In: I72d37db133fdabb0eef1b332f1128b4fb23ea866
1 file changed