Bug: http://b/21364029 Change-Id: I9716d6b0ea7fae6483629a290dbe695b68526588 (cherry picked from commit 79b3877a137510946ddd39ab71c0badf1a769c11)
Bug: http://b/21364029 Change-Id: I8648d1bff6c8fd6e7cd12da7f128e048b9f2829a