Merge "Handle null left and right tab strip drawables" into oc-mr1-dev
am: 286c7db342

Change-Id: I82092817d26af0a372923d238b9f84112f196ad2