There was some missing handles. Fixed style. Bug: 26990650 (cherry picked from commit 1fd00287) Change-Id: If7cb0de61e6b19004838e98345fdbc60ccdd5767