Patch 3

Change-Id: Ib04913a966e5fdbc3b6b1b22189d86f184c15523
(cherry picked from commit 1928cf881387e735bcec0b2bd97152018d06c113)