Allow sideload to be used in conjunction with other commands.

Change-Id: I8b35a010e5fdb36cec991c56d5cd0def72865308
6.0.4.2

Change-Id: If31be58f4ecb9ab95cca7af0cde5ce32f25c8573
6.0.4.3

Change-Id: I4ac989ed7efcfd8988057813a94e153d15aad3a3
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2