Change-Id: I742ccbe3669b2ecf70dc260b91c6eb98c3688b2f Closes-Bug: #1517362 (cherry picked from commit 798f832759)
798f832759